bitkeeper revision 1.1159.168.7 (419a6fbepARynjSYyfFg1S3Py1v94A)

Xen build fixes. Work with Hardened GCC.

diff --git a/xen/Makefile b/xen/Makefile
index 2536492268c91aa4d8fd0a8b7ed71bc2d682d82b..da36a2010d07c6ebcc1f602740a6c88b234a562b 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -26,7 +26,7 @@ install: $(TARGET)
        install -m0644 include/public/COPYING $(prefix)/usr/include/xen
 
 dist: $(TARGET)
-       $(MAKE) prefix=`pwd`/../install dist=yes install
+       $(MAKE) prefix=`pwd`/../dist/install dist=yes install
 
 clean:
        $(MAKE) -C figlet clean

diff --git a/xen/Rules.mk b/xen/Rules.mk
index ecb20cb35a08c260ba8390f1caf1b0210537020a..63c3a51784c21b1d7263d76d52126daaacf4c84c 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -39,6 +39,8 @@ ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 HOSTCC     = gcc
 HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer 
 
+test-gcc-flag = $(shell gcc -v --help 2>&1 | grep -q " $(1) " && echo $(1))
+
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
 
 ifneq ($(debug),y)
@@ -62,6 +64,8 @@ ifeq ($(trace),y)
 CFLAGS += -DTRACE_BUFFER
 endif
 
+CFLAGS := $(strip $(CFLAGS))
+
 %.o: %.c $(HDRS) Makefile
        $(CC) $(CFLAGS) -c $< -o $@
 

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index fd4577f48cfab8010de55d1dbb949c37f8717b58..bceb1982f4377758c7a0a53f0f7e313fc67e3435 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -14,10 +14,14 @@ else
 x86_32/usercopy.o: CFLAGS += -O1
 endif
 
-
 # Prevent floating-point variables from creeping into Xen.
 CFLAGS  += -msoft-float
 
+# Disable PIE/SSP if GCC supports them. They can break us.
+CFLAGS  += $(call test-gcc-flag,-nopie)
+CFLAGS  += $(call test-gcc-flag,-fno-stack-protector)
+CFLAGS  += $(call test-gcc-flag,-fno-stack-protector-all)
+
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS := --oformat elf32-i386